Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Reconcile 2.0-pre with master #89

Merged
merged 36 commits into from
Oct 7, 2024
Merged

Reconcile 2.0-pre with master #89

merged 36 commits into from
Oct 7, 2024

Conversation

pkienzle
Copy link
Collaborator

@pkienzle pkienzle commented Oct 7, 2024

Make sure all changes on master are in the 2.0-pre branch and keep both branches on the block chain.

Fixes minor issue in mass comparison: uncertainty in the table is are not relative.

Paul Kienzle and others added 30 commits May 18, 2022 22:19
restore exception raised when 'b' mode production activity produces n…
f371063 
…egative values
check activation calculation completes for all elements
1297b3a
Nicer error message for trans-uranic xray sld failure. Refs #56
bc73cd2
@jfkcooper
scattering already returns None if not self.has_sld
d7ac5e6
@jfkcooper
changed isotope masses and reference to where they came from
585117b
@jfkcooper
revert code change and update docstring
ddb3e60
Use older ubuntu to test python 2.7 and 3.6
3351925
Drop tests for python below 3.8
a6b7cc9
@pkienzle
Merge pull request #57 from jfkcooper/updated_isotope_masses
9365566 
Updated isotope masses
Update tests for new element masses
c6b980e
Use AME2020 for neutron mass
3c99287
Use IUPAC CIAAW tables for abundance and atomic weight
b653710
Start noting changes to mass tables
45b65e3
Move uncertainty parser to util so it can be used for other tables
64de891
Fix typos in ATI tables: Zr[90].neutron.b_c changes from 6.9 to 6.0
c7e55da
Use uncertainty parser for neutron table, but ignore uncertainty for now
f020397
Fix typo in 56-Ba-138 total scattering uncertainty
c32f3d1
Fix tests which broke because of updated tables
bba9695
Fix build issues with docs?
ee2f2d3
Update docs
58c3d08
Fix doc syntax
9605ef1
Allow wt%/vol% in addition to %wt/%vol
1cc5bcc
change %wt/%vol to wt%/vol% in docs
f1f09c8
fix markup warning in docs
4178b40
@pkienzle
Merge pull request #65 from pkienzle/fix-allow-wtvol-percent
1b63ee5 
Use wt% and vol% for mixtures instead of %wt  and %vol
@pkienzle
Merge branch 'master' into fix-use-iupac-abundance
fed2097
fix precision in mass example
55ce71c
@pkienzle
Merge pull request #58 from pkienzle/fix-use-iupac-abundance
7492849 
Use IUPAC tables for atomic weight and isotopic abundance
@andyfaff
MAINT: fixes for np2
d72a009
@pkienzle
Merge pull request #81 from andyfaff/nan
8123cd5 
MAINT: fixes for numpy 2
@pkienzle pkienzle mentioned this pull request Oct 7, 2024
Closed
@pkienzle
Test from installed wheel (#91)
3d43e6c 
Restructure CI to build wheel and test from wheel on different platforms.
@pkienzle pkienzle changed the base branch from master to R2.0-pre October 7, 2024 22:32
@pkienzle pkienzle merged commit 6e37976 into R2.0-pre Oct 7, 2024
5 checks passed
@pkienzle pkienzle mentioned this pull request Oct 7, 2024
Closed
@pkienzle pkienzle deleted the reconcile branch October 7, 2024 22:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@pkienzle @jfkcooper @andyfaff @bmaranville